rename "signal" arg to "name" to avoid compiler warnings about shadowing

2002-02-04  Havoc Pennington  <hp@pobox.com>

	* gtk/gtksignal.c (gtk_signal_connect_while_alive):
	(gtk_signal_connect_object_while_alive): rename
	"signal" arg to "name" to avoid compiler warnings
	about shadowing signal(). #70453

diff --git a/ChangeLog b/ChangeLog
index 4613f1642fc9286b3bd624ff1daad70fc5724196..b582bd3ec351b98e79952de09c5d38f730d2a8f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-04  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtksignal.c (gtk_signal_connect_while_alive): 
+       (gtk_signal_connect_object_while_alive): rename 
+       "signal" arg to "name" to avoid compiler warnings
+       about shadowing signal(). #70453
+
 2002-02-03  Anders Carlsson  <expander-master@gtk.org>
 
        * gtk/gtkstyle.c (gtk_default_draw_expander): Add 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4613f1642fc9286b3bd624ff1daad70fc5724196..b582bd3ec351b98e79952de09c5d38f730d2a8f8 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2002-02-04  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtksignal.c (gtk_signal_connect_while_alive): 
+       (gtk_signal_connect_object_while_alive): rename 
+       "signal" arg to "name" to avoid compiler warnings
+       about shadowing signal(). #70453
+
 2002-02-03  Anders Carlsson  <expander-master@gtk.org>
 
        * gtk/gtkstyle.c (gtk_default_draw_expander): Add 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4613f1642fc9286b3bd624ff1daad70fc5724196..b582bd3ec351b98e79952de09c5d38f730d2a8f8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2002-02-04  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtksignal.c (gtk_signal_connect_while_alive): 
+       (gtk_signal_connect_object_while_alive): rename 
+       "signal" arg to "name" to avoid compiler warnings
+       about shadowing signal(). #70453
+
 2002-02-03  Anders Carlsson  <expander-master@gtk.org>
 
        * gtk/gtkstyle.c (gtk_default_draw_expander): Add 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4613f1642fc9286b3bd624ff1daad70fc5724196..b582bd3ec351b98e79952de09c5d38f730d2a8f8 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2002-02-04  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtksignal.c (gtk_signal_connect_while_alive): 
+       (gtk_signal_connect_object_while_alive): rename 
+       "signal" arg to "name" to avoid compiler warnings
+       about shadowing signal(). #70453
+
 2002-02-03  Anders Carlsson  <expander-master@gtk.org>
 
        * gtk/gtkstyle.c (gtk_default_draw_expander): Add 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4613f1642fc9286b3bd624ff1daad70fc5724196..b582bd3ec351b98e79952de09c5d38f730d2a8f8 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2002-02-04  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtksignal.c (gtk_signal_connect_while_alive): 
+       (gtk_signal_connect_object_while_alive): rename 
+       "signal" arg to "name" to avoid compiler warnings
+       about shadowing signal(). #70453
+
 2002-02-03  Anders Carlsson  <expander-master@gtk.org>
 
        * gtk/gtkstyle.c (gtk_default_draw_expander): Add 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4613f1642fc9286b3bd624ff1daad70fc5724196..b582bd3ec351b98e79952de09c5d38f730d2a8f8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2002-02-04  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtksignal.c (gtk_signal_connect_while_alive): 
+       (gtk_signal_connect_object_while_alive): rename 
+       "signal" arg to "name" to avoid compiler warnings
+       about shadowing signal(). #70453
+
 2002-02-03  Anders Carlsson  <expander-master@gtk.org>
 
        * gtk/gtkstyle.c (gtk_default_draw_expander): Add 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4613f1642fc9286b3bd624ff1daad70fc5724196..b582bd3ec351b98e79952de09c5d38f730d2a8f8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2002-02-04  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtksignal.c (gtk_signal_connect_while_alive): 
+       (gtk_signal_connect_object_while_alive): rename 
+       "signal" arg to "name" to avoid compiler warnings
+       about shadowing signal(). #70453
+
 2002-02-03  Anders Carlsson  <expander-master@gtk.org>
 
        * gtk/gtkstyle.c (gtk_default_draw_expander): Add 

diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index 0729a064ea847e270021c1cc9797967bd564b187..380ad51e34acc6e9051070b5d1f6242e02fcd7f0 100644 (file)
--- a/gtk/gtksignal.c
+++ b/gtk/gtksignal.c
@@ -96,21 +96,21 @@ gtk_signal_emit_stop_by_name (GtkObject   *object,
 
 void
 gtk_signal_connect_object_while_alive (GtkObject    *object,
-                                      const gchar  *signal,
+                                      const gchar  *name,
                                       GtkSignalFunc func,
                                       GtkObject    *alive_object)
 {
   g_return_if_fail (GTK_IS_OBJECT (object));
   
   g_signal_connect_closure_by_id (object,
-                                 g_signal_lookup (signal, G_OBJECT_TYPE (object)), 0,
+                                 g_signal_lookup (name, G_OBJECT_TYPE (object)), 0,
                                  g_cclosure_new_object_swap (func, G_OBJECT (alive_object)),
                                  FALSE);
 }
 
 void
 gtk_signal_connect_while_alive (GtkObject    *object,
-                               const gchar  *signal,
+                               const gchar  *name,
                                GtkSignalFunc func,
                                gpointer      func_data,
                                GtkObject    *alive_object)
@@ -122,7 +122,7 @@ gtk_signal_connect_while_alive (GtkObject    *object,
   closure = g_cclosure_new (func, func_data, NULL);
   g_object_watch_closure (G_OBJECT (alive_object), closure);
   g_signal_connect_closure_by_id (object,
-                                 g_signal_lookup (signal, G_OBJECT_TYPE (object)), 0,
+                                 g_signal_lookup (name, G_OBJECT_TYPE (object)), 0,
                                  closure,
                                  FALSE);
 }

diff --git a/gtk/gtksignal.h b/gtk/gtksignal.h
index a9c2e34a235d5e8c6855c326211fb1cc957d9ff2..cc4ab942d2b001c189d255e551a82db0bc2d193d 100644 (file)
--- a/gtk/gtksignal.h
+++ b/gtk/gtksignal.h
@@ -106,11 +106,11 @@ guint     gtk_signal_new                          (const gchar        *name,
 void   gtk_signal_emit_stop_by_name            (GtkObject          *object,
                                                 const gchar        *name);
 void   gtk_signal_connect_object_while_alive   (GtkObject          *object,
-                                                const gchar        *signal,
+                                                const gchar        *name,
                                                 GtkSignalFunc       func,
                                                 GtkObject          *alive_object);
 void   gtk_signal_connect_while_alive          (GtkObject          *object,
-                                                const gchar        *signal,
+                                                const gchar        *name,
                                                 GtkSignalFunc       func,
                                                 gpointer            func_data,
                                                 GtkObject          *alive_object);